drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
307,959 Commits 1 Branch 0 Tags
Commit Graph

307959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
b97ce9eb47 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: d4177b8610 -s ours 
am: 53c71a90fb  -s ours

Change-Id: Ibc881b5f7161b876de104aece3ffdb133389b0e2
 2017-02-17 10:29:48 +00:00
Bill Yi
53c71a90fb Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: d4177b8610  -s ours

Change-Id: I73ba26823b2c27cf1f492558bf6b7c176c296282
 2017-02-17 10:24:43 +00:00
TreeHugger Robot
d4177b8610 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-17 10:16:42 +00:00
Shreyas Basarge
4edbf055ed Merge "Use separate message ids for backup and restore operations" 2017-02-17 10:14:50 +00:00
TreeHugger Robot
6fd0e8d5d4 Merge "Import translations. DO NOT MERGE" 2017-02-17 09:39:51 +00:00
TreeHugger Robot
5cf832c5ae Merge "Import translations. DO NOT MERGE" 2017-02-17 09:38:47 +00:00
TreeHugger Robot
956edcafe4 Merge "Import translations. DO NOT MERGE" 2017-02-17 09:38:07 +00:00
TreeHugger Robot
0478678634 Merge "Import translations. DO NOT MERGE" 2017-02-17 09:32:53 +00:00
TreeHugger Robot
ec8a096d59 Merge "Import translations. DO NOT MERGE" 2017-02-17 09:30:16 +00:00
TreeHugger Robot
c5f6c336d5 Merge "Import translations. DO NOT MERGE" 2017-02-17 09:28:39 +00:00
Bill Yi
385ae1a01a Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: d74b5f551d -s ours 
am: 5871f5ec47  -s ours

Change-Id: Ide5be834d46fe28c499382b756a64530881ac883
 2017-02-17 09:23:42 +00:00
Bill Yi
5871f5ec47 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: d74b5f551d  -s ours

Change-Id: Iffab34c61046aeeca37a906107f4183952156654
 2017-02-17 09:19:10 +00:00
TreeHugger Robot
d74b5f551d Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-17 09:10:42 +00:00
TreeHugger Robot
5dd1308bbc Merge "Fix duplicate calls of IMS#doStartInput()" 2017-02-17 08:24:47 +00:00
TreeHugger Robot
a722a2ea38 Merge "Add missing transitive dependencies" 2017-02-17 05:19:05 +00:00
Bill Yi
94a1e0fca6 Import translations. DO NOT MERGE 
Change-Id: Ia854a721fe3df7212deb75df8ab7c4adb5b531c1
Auto-generated-cl: translation import
 2017-02-16 21:18:39 -08:00
Bill Yi
deb08a3096 Import translations. DO NOT MERGE 
Change-Id: I80580cf6ece02cc20f4cda744f2b3599ec3985cd
Auto-generated-cl: translation import
 2017-02-16 21:09:53 -08:00
Bill Yi
3e97f5c9ca Import translations. DO NOT MERGE 
Change-Id: Id1a24d5bd8306f602f6cd6e42fe7ca70c1e2c750
Auto-generated-cl: translation import
 2017-02-16 20:55:10 -08:00
Jerry Zhang
9c78253b75 Merge changes from topic 'svcusb' am: 5e2a2ee39e am: 6f44072d03 am: 35f8d6cfd0 
am: fba74d6c61

Change-Id: I190467cba81aca56f32a0a6ff6d8e798e1e7ac30
 2017-02-17 04:41:32 +00:00
Jack Yu
535ee425c1 Merge "Added the new RIL request to set SIM power state" am: 2f21f71da4 am: bf21df3306 am: 8c89daceaf 
am: 3edeec530f  -s ours

Change-Id: I4b91dd6796986c8f00574360fcb47a40996dac03
 2017-02-17 04:34:50 +00:00
Bill Yi
db067b2c4d Import translations. DO NOT MERGE 
Change-Id: I5c7c9644748b50c15eeda5bc0c6c1505d309cdeb
Auto-generated-cl: translation import
 2017-02-16 20:09:24 -08:00
Bill Yi
ec5916d9de Import translations. DO NOT MERGE 
Change-Id: Ia9de3c96be0035fbe45cabec9300b19acde07e80
Auto-generated-cl: translation import
 2017-02-16 20:06:15 -08:00
TreeHugger Robot
ec453e0106 Merge "Remove nested preference from its parent." 2017-02-17 04:01:41 +00:00
Bill Yi
8a934a2454 Import translations. DO NOT MERGE 
Change-Id: I3fb0605acf60b1bed44058c9013d6e7ed3c9b3f0
Auto-generated-cl: translation import
 2017-02-16 19:52:15 -08:00
Bill Yi
17ebc1fe0f Import translations. DO NOT MERGE 
Change-Id: I7ef099237bb5000aa94cbab1bf6e671600c97239
Auto-generated-cl: translation import
 2017-02-16 19:46:21 -08:00
TreeHugger Robot
48d47505eb Merge "Update visibility logic in realStartActivityLocked" 2017-02-17 03:44:36 +00:00
Bill Yi
e625669da0 Import translations. DO NOT MERGE 
Change-Id: Ie60c04fad3648eaa921149e432de426a9a60db5c
Auto-generated-cl: translation import
 2017-02-16 19:42:59 -08:00
TreeHugger Robot
876f266271 Merge "Fix AccountManagerService caused by empty package names list." 2017-02-17 02:31:29 +00:00
Jerry Zhang
fba74d6c61 Merge changes from topic 'svcusb' am: 5e2a2ee39e am: 6f44072d03 
am: 35f8d6cfd0

Change-Id: I10c0be37b583f1670cb98e926aefb9dc8b986843
 2017-02-17 02:24:44 +00:00
Jerry Zhang
35f8d6cfd0 Merge changes from topic 'svcusb' am: 5e2a2ee39e 
am: 6f44072d03

Change-Id: Ic30bca41e088c2d077dc5aa09e373a02acb60be6
 2017-02-17 02:16:11 +00:00
TreeHugger Robot
d2bd42e736 Merge "Add Secure setting for the assist gesture." 2017-02-17 02:12:58 +00:00
Jerry Zhang
6f44072d03 Merge changes from topic 'svcusb' 
am: 5e2a2ee39e

Change-Id: I4b628b80e348e25377d0855301374e71cb8f2c64
 2017-02-17 02:11:45 +00:00
TreeHugger Robot
1ad4f0e60b Merge "Adds @hide ImsService APIs" 2017-02-17 02:09:48 +00:00
Treehugger Robot
5e2a2ee39e Merge changes from topic 'svcusb' 
* changes:
  Add data unlock argument to set function command.
  Allow the shell to set USB functions.
 2017-02-17 02:01:55 +00:00
Bill Yi
1c1c4979c6 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: f54038169c -s ours 
am: f1442845c3  -s ours

Change-Id: Ife71c182778ed061acae6ec5efd440309cd8a553
 2017-02-17 02:00:16 +00:00
Hugo Benichi
ab7cab4ac2 Merge "resolve merge conflicts of 9355bce0c323 to master" 2017-02-17 01:53:57 +00:00
Hugo Benichi
01432b306d resolve merge conflicts of 9355bce0c323 to master 
Test: none
Change-Id: Iac65e01d07edf79ec97e7d996f8cfee6f811606b
 2017-02-17 10:47:58 +09:00
Jack Yu
3edeec530f Merge "Added the new RIL request to set SIM power state" am: 2f21f71da4 am: bf21df3306 
am: 8c89daceaf

Change-Id: I7dd15375a56a9243bf0c24c87def9949596093e0
 2017-02-17 01:40:51 +00:00
Colin Cross
25efb997e7 Add missing transitive dependencies 
Add android support libraries to SettingsLib/common.mk.

Test: builds
Change-Id: Ib62a5dd6ee1cf39c99c9cce3a9310c35cf631fdf
 2017-02-16 17:31:51 -08:00
Jack Yu
8c89daceaf Merge "Added the new RIL request to set SIM power state" am: 2f21f71da4 
am: bf21df3306

Change-Id: I7d11f132ca483272963f12363496d70651076f0b
 2017-02-17 01:31:49 +00:00
Jack Yu
bf21df3306 Merge "Added the new RIL request to set SIM power state" 
am: 2f21f71da4

Change-Id: I75402ea985f81fd4f420cf7bfb4b07680a11ef2f
 2017-02-17 01:22:22 +00:00
Yohei Yukawa
4e28668a15 Fix duplicate calls of IMS#doStartInput() 
This is another follow up CL to my previous CL [1], which had a bug
that InputMethodService#doStartInput() is now always called back twice.

There was a careless mistake when rebasing the CL [1] onto the previous
CL [2], which ended up with dispatching startInput() twice in
IInputMethodWrapper.

In short, InputMethod#dispatchStartInputWithToken() is the new way to
dispatch startInput()/restartInput(). We do not need to call both of
them.

 [1]: I9921b381e02106dbffff5e0b3d13f0a1245ce807
      6db3bfe33d92127d203ec872a0b353585a99f256
 [2]: I476d0cf8cbb0a0134941854f9337d9ad15e66a71
      f7526b58960608887b064670bb42f41aa28b8f41

Test: Set true to InputMethodService#DEBUG and make sure startInput()
      and restartInput() are called in the following scenario.
      1. Complete the setup wizard.
      2. adb shell am start -a android.app.action.SET_NEW_PASSWORD
      3. Proceed to "Choose your password" page
      4. Make sure startInput() gets called only once.
      5. Type "aaaa" then hit "CONTINUE" button.
      6. Make sure restartInput() gets called only once.
Bug: 35079353
Fixes: 35442939
Change-Id: Ifde16c3fad5b787d4c9a11bd886943dfe96f9eb9
 2017-02-16 17:19:00 -08:00
Treehugger Robot
2f21f71da4 Merge "Added the new RIL request to set SIM power state" 2017-02-17 01:13:26 +00:00
Dongwon Kang
7d8875a178 Merge "TIF: add PreviewPrograms" 2017-02-17 01:07:04 +00:00
TreeHugger Robot
ce14bf032e Merge "Import translations. DO NOT MERGE" 2017-02-17 00:48:33 +00:00
Bill Yi
f1442845c3 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 
am: f54038169c  -s ours

Change-Id: I1524a1cd097f8394cf067f61880efc55f7e48627
 2017-02-17 00:36:17 +00:00
TreeHugger Robot
f54038169c Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-02-17 00:25:27 +00:00
Hugo Benichi
9355bce0c3 Merge "IP connectivity metrics: delete obsolete logger service" am: 37e3f22c2e am: c54962a4bd 
am: 9c2b6afa2f

Change-Id: I5f8cd508812d9532778c2f1f019308a4b8d8ee33
 2017-02-17 00:18:35 +00:00
Sujith Ramakrishnan
75ad8a5b21 Merge "Transition from Activity to Broadcast for TV Search" 2017-02-17 00:17:30 +00:00
Hugo Benichi
9c2b6afa2f Merge "IP connectivity metrics: delete obsolete logger service" am: 37e3f22c2e 
am: c54962a4bd

Change-Id: Iccc3ee97bd2ac267b312c6c7d9269ac02a2bd68e
 2017-02-17 00:09:11 +00:00